Added CircuitBoard Modules, removed IModule & Module