renamed folders
some cleanup
added some common code