Updated application to be modularized.