Reorganized packages
Cleaned up logging output
Testing on representative map