Changed main files to correct