Changed file structure to make more sense.