Commit from JBoss Tools
fixing package structure to work with eclipse, stupid intellij jacked it all up