Moved some files where they belonged