Cleanup
Renamed directory (case)
Implemented block manipulation for blocks