new folder structure and basic layout