Restructure The Project - Added Modularity