Revert "Started syncing and refactoring"

This reverts commit 7232293a41fec6a109f015974472484f3a941883.
Syncing done except saving to file