minor clean up
simplify objects hierarchy
convert files with dos2unix command
rename WMASK to XMASK