Rearranging packages and fixing imports