Merge with all unneeded files removed. Looks a lot cleaner now.