Renamed dirs and updated readme