[Project] Change codestyle. Rearrange.