moving to the correct package structure