Better organized file structure and updated readme