Changed name of solution and added domain classes