Reverted some changes.

Moved out specs from namespace folder before so I revert this because
it was silly.