Done A few changes
Moved Things