Removed old hbase-* files, rebuilt, fixed arguments_ bug and fixed circular dependency

This should now run as expected.