More file restructuring, changes so debuild builds and installs plugins properly