moved all files/directories up one level for consistency