Change package and directory
Temporary fix for incorrect moves