Organize

according to the way the path in the code (eclipse style)