reorg layout / single jar
reorg
refactoring/bootstgrap