Code Cleanup

1. Moved some class files into the core folder and prefixed with Mod/