Moved files to more appropriate locations