Added different settings, added core-app
Renamed folder