Refactoring directory structure

Signed-off-by: Mikhail Grigorev <sleuthhound@gmail.com>