Initial commit restructuring the folders