Re-factoring to NetBeans project and engine design