Added theme. Reorganized structure.