Refactored application to prevent class path issues later on.