Created master directory and copied in new project wizard
Renamed packages and moved classes around