Added selector performance and updated file structure