Fix merging issues
update structure. revert application layout to default