make final classes
fix Spring context .. it was broken