Sorted out the file structure I accidentally stuffed up