Refactoring filenames. Merging changes from features branch
Resolved: #10, #11, #12
#10, #11, #12. Adding updated files.