refactors packages and files