Get to 80% test coverage, move around plugin libraries