last commit before moving to liclipse WIP
moved to liclipse, re-org, basic functionality restored