Reorganized, prepared for detaching core submodule (lib)