Rearranged app structure to be BEM-compatible