Some more changes to folder structure