Moving some packages around for better semantic meanings