delete subpackage & since
apply coding standards
apply changes to templates
Revert "apply coding standards"

This reverts commit 321cf1a46c956aff3fe6dbbe045398c5b15f4d7c.
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards
apply coding standards