Created correct folder structure