Refactoring
Rearranging file