Changed folder structure to reflect more complex project