Moved code around - added more samples for Spring-scala