+ renamed main dir in order to create python module hierarchy