Split discoveries into different files. Should also fix eclipse import
issues.