[Master] Slight refator
[Master] Remove accidentally created file. (All code goes in headers)