moved files to default maven structure and commited some bad changes that stuck in the repo (refs #2)