new bs files, reorganized, html templates