project restructure & python3 upgrade