Changed folder structure to reflect usual angular app structure