Commit before everything breaks!

Title says it all. This commit will mark the point before I make major
path changes in the code