moved some files around

Moved core module to core folder