Changing names of files that make more sense
Finished cleaning up masonry