Moved stuff down one level.
Removed the old subdirectory.