Restructuring static files
Restructure and grunt testing