Reorganize pom and update tycho