Timestamp() moved to base
Moved net.h & net.cpp to base
Small fixes