Moved the Core out into an extra module to continue easy support :)