move some methods and properties to more appropriate file