Refactoring
Add jbuilder stuff