Revert "Small indepent modules"

This reverts commit 303bd7160bfddd3b109e64a2fa6c9815aae2a72d.