Restructured folders and made pip install work