Initial reorganizing

This commit reorganizes the theme to some extent as per @Twiebie
direction to move them into proper folders