Moved velocity templates under the right package