App structure

App file structure changed
Issues removed