Fixed issue where Application.cpp is used to create all objects.