Minor clean up and moved Item core classes to API package