Reogranized project & deleted some cruft files