restructure and base modules for different features

No match.