Change project structure; add database