Moved non builder classes out of .builder package an into proper packages