Directory structure reorganized to avoid conflicts

Each theme should be in it's own directory, not in subdirectory. Otherwise Drupal picks up templates even from disabled and un-related themes