Reogranized project & deleted some cruft files
Use full filter