Had to roll back a lot of commits, mostly related to fixing the file hierarchy.