Move to pythonic directory structure