re arrange project layout and class names