Still not happy with the directory structure, going back to something a little more common, though messy