Fixed issues, moved few packages and increased the version no