General cleanup of the codebase, remove redundant files. You will need to do a full rebuild after this commit.