Revert "Tried moving stuff and fixed some file paths"

This reverts commit f409c2ea5ac46d345d59380bec76bc852294149f.