Reorganized

Signed-off-by: mustela <ejankowski@gmail.com>