Start moving common functions into global, and use case specific functions into local dirs