Converting partially into proper module format