Folder structure, added some new code