Changed namespace and basic structure of the project