Updated Readme and consolidated files