added support for packages
deleted old template classes