Updated files to fit the expected structure. Updated README