refactor App & support mvn assembly