move methods to the right place