moved files around for structure, get ready for jenkins and preview