files rearranged
minor updated