Fixing namespace names & adding uses to head of main file