Ordering some packages, classes. Renaming project. Cleanup.
Fixing compile errors. Ok now.