some project tree stuff
merged github stuff with local stuff