Modified makefile and moved to gpu integration, pbc