Move functional files up one level
Merge routines into Config