Almost done, Content folder add and comps