more clear configuration and better dir structure