Moved move kv to the dedicated kv file
Fixed indentation error
Pulled out controller to an external file