Reordered the Source Code for easy mod + tracking