Fix errors and move everything into one namespace