minor reorganization

moving files around. adding new layouts in preparation for layout
structure change. updated paths