Added initial config files
Added logic