compilation fixed
module & directory rename
next corrections