Rearranging of code
File Loading