Exceptions added and reestructure directorys and files
configs updated