Intermediate commit - working on folder restructuring