Updated _kit folder structure