Moved functions (commands) to separate files