Minor fixes; Renamed a subfolder