Folder restructure, began syntax checks