Restructured to standard maven module structure