Moved objects around

Placed stuff in their correct folders