Fixed directory structure.
Added new db, static files.
Resolved conflicts.