Cleaning up project.  Will most likely need to re-import into eclipse.