move classes to their own files and reorganize. clean up import statements that pycharm dirtied