1. Introduced separate files for Formlet and Common