Updated file names and added method stubs
Merge branch 'master' of https://github.com/amccann/Rubix