move methods to proper files