Revert "Fix oauth token checking"

This reverts commit a027dd81b262295f44aac6f261cf8be485634e46.
Turn subpackages into modules