Removed unused files and renamed resources and classes to better following naming schemes