Reorganized directory structure and moved to Python 3