HIEM Re-architecture

Removed javadoc comments from initial coding effort