Moved files out of test folders