Updated to compile with build 83. Refactored the package structure.