Major rewrite and restructure
Switch placeholders to use mixins, and general cleanup