[refactoring] Moved some files to a subdirectory.