Architecture tweaks + Rest test draft