Moved core files.
Removed redundant constants.