More naming conventions and controller moved
Fixed controller interface