Solution restructuring

Package paths changed