Moving all functions to its own modules (In-Process)