updated classes structure without junit tests