Modularize the application