Directory rearranged
locale config updated
setup script updated