Modified structure
Updated Spring version