Cleaned up solution, added client command provider
Moved Resources