Move some files
Rename things, add start of multithreading