initial commit
some renamings