Changed some file locations
Fixed NPE