improving componentization and removing prototype project