Some project rearrangement. Prepare for bottle web app.