Added loading configuration and change file structure