Updated and changed folder structure