Reorganized structure for use in PyCharm