Reorganized source heirachy.
Removed modeling project due to file corruption.
Removed remaining Modeling project files.
Repaired test classes.