Organized some configuration failes
Organized some code style