split the extension into individual files and remove some useless code