Added src includes
Made make sense in context
import redirect
reorg of most files, start sqlite stuff