organised packages, cleaned up code and added findOperation method