Reorganize poject