refactored implementation of modules and unified structures
unified interface of annotations