(Major Change) - Moves functions to their respective files