pages working and building merged into glass-build
new folder structure