Moved around functionality + renamed classes per Patrick