restructure and rename project