Improve the directory structure

Improve the directory structure, same little changes in the readme and
config