First version of a better build system with a completely new file structure
Resolved merge conflict with Tessa's changes
Resolved merge conflicts with Hugo's changes