Refactor core structure for better optimization and support for more features like [Adding and removing items](#91)
Refactor core structure for better optimization and support for more features like Adding and removing items