Added new classes in Application and Core in prep for a more structured approach.