Emptied the repository, and imported my current working directory. Too much has changed to solve it in a cleaner way, but I really should start using this again.