Cleaned up a bit in the design of the modules

Signed-off-by: Laex <laex@bk.ru>