update: refactor layouts

Consolidation of layout-base and layout-core files. Added new helper
for scroll spy