Revision 2.0

Done with config files location