Corrected project structuring issues

This turns out to be a badly pointed pycharm issue... corrected now.