Reorganized to be a Maven Project and updated for 1.7.2