Added class shell files, fixed naming conventions