Rearranged folder structure. Code explicitly shows manual initialisation process