added some files, normalizing structure