bugfix - correct some miss types
change directrory structure