refactor: Fix namespace naming and use nicer syntax for getting classes