restructured filesystem
merge with github
got rid of old stuff