Start modularizing core