#72: moved and renamed module for theme
#72: refactoring of package