refactor layout
semi working spec file