added concatenate task to grunt, reorganized build structure