modify dir strucure and bugfix