Finished moving of files, more refactor in backend