Updating dependencies for Maven, fixing source directory (for Maven naming conventions)