Changed folder structure
Added new folder structure
Refactored packages