Look in correct folder for files

And remove un needed code