Massive reorganization and cleanup, using grunt for builds now