Modularized the application