move everything out of stupid subdirectory