updating code

adapting code to movement of files and working on backend.