Moved ItemListener.java to CarePackage.java and some fixes