Deleted old dependecies and added core with some fixes