Restructured the entities and started developing some components.