Code refactor
>Changed resource class names to be more simplistic and high level