fix spec
fix file layout
fix