project structure refactoring, grunt support