Refactor build settings
Refactor velocity module