fix file layout
fix gox
mv Flatten
Merge branch 'fix/layout'