Restructure mkVHDL and getArchitecture a bit.