Improve Craft as components and Forge as app library