Reorganizes distribution modules

Signed-off-by: Mario Krizmanic <mario.krizmanic@gmail.com>