Reorganization for Eclipse project space

Massive file reorganization for my build environment.
Cleaned up a few template instances to actually specify the template
types being invoked. Only warnings left are unused imports.