Revert "Improve RPC, still doesn't work though"

This commit should've gone into a branch...

This reverts commit ceb6a942f330346dea1a785af2baed4a03441cd8.
Revert "Restructuring to add RPC"

This commit should've been in a branch

This reverts commit 406ec24ca957626793e647767dc144c13e4d0f67.