fix packages and move methods around