2.02.0:jdmanring:17 Bugfix for Issue #40

- Fixed messed up CoAs
- Deleted some duplicate files