Transfered and updated.
Moved all files into same directory for testing. Also cleaned up a little.
Also, updated files to have the same port names for similar modules.