Move some things around, better minification/concatenation workflow