directory rearrangement
More re-arrangement
First draft of database schema.