Finally deleted nbproject
reorganized source and added more model classes