Changing directory structure a bit. Might be a mess
Git is acting weird