WIP #82

Fixed all module files