Major refactoring of System/Internal to make it more structured