Reorganized some code, and added a forced inclusion of Core.hpp for both compiler and intellisense