moved some stuff into the core directory