project clean up

removed non used files/types
moved types around project/namespaces to declutter the intellisense experience