Changed the folder structure. Made some small changes.