restructured repo, added extra items