Small changes to folder structure