Changed file structure so it's now not on Pip