Updated folders to include Maven/Spring layout and configuration