Simplify sample
Extract classes to separated files