Cleaning up some more packages + adding HDFS unit test