core moved on level deep
Maven build refactored
Merge branch 'wi'