Moved some files into appropriate locations