update requirements, make things less tied to directory structure, added some default data