removed not needed variables
moved files areound