Adjusting app base to new structure