New JB changes and organisation
Removed some things and dpendencies
Make some changes to compile