<imp> loading bug;
<imp> refactored _core_ aspects into diff files;
<imp> refactored _core_ aspects into diff files; and makefile;