Issue #5; file/class naming conventions