Organised the folder structure