Tried moving stuff and fixed some file paths