Reworking the base framework and slowly building up Javaboom in a seperate package adjacent to it.