Moved files to more logical locations