Moved code to Core.cs

This works, but it is recommended?  The extra file seemed unnecessary.