Reorganization

Proposing a better order for contents in repo.