Improve file structure
Some more tinkering
Rename config file to match lib name