Broke up NN into package