adding comments and moving the config to proper name