Organize directory structure

- prepare tree for mavenization