Add new java Datatypes for CF API mapping, cleaned up repositories and AJS.