changed dir names
added sources for maven