Moved stuff out of the subdirectory