Renamed packages to org.
Added Spring