Added key shit and changed file structure