Remove redundant import
Move watchlist into module folder
Continued work on watchlist feature