Changed my file structure to neaten it up