Updated the file structure, ReadMe and other changes