Project Restructuring
Updated Namespace