Cleaning/renaming and moving KeyWrapper

Cleaning up whitespace and renamed files to reflect trello names
Moved KeyWrapper to its own file