More pythonic directory structure