Moved files and fixed tests