velocity version moved to 1.6.4, and some imorts refactored