move remaining files and cleanup dirs