Added projects to unclutter dll and gha files
Moved class so that they sit in the right dll/gha