Organized the files better. Not sure if this will compile