Cleaned up a lot of files due to bad merge. Updated package stuff.