Few changes to modules & folding methods (manually for now)