Cleaned the scope and the Spring config
Renamed the sample
Huge renaming and minor fixes