Added rubber, organized package stucture, bug fixes.