Separate api and web classes, add rspec