Sepated modules for alternative clustering and atomic decomposition.
Removed redundant dependencies.