Restructured to default maven folder structure. gitignore improved.