Weather Logic and Controller refactoring
Merged after Angular and Weather Logic