Updated server port and cleaned module file organization