Moved files to more relevent locations