Rearranged sporter-grenar. Cleaned up database.