Changed file structure to be less cluttered