Cleaned dependences and created entity classes