renamed some files
update source code after the file rename, and moved some code