Removed picking behavior from application and added new classes.