refactor and add updates

restructured folders fixed up manifest. added updates