Moved files to the expected place, fix dependancies