Better class names
Use annotations and component scanning