Project cleanup, Spring DI to make proper bean