Moved files into packages instead of using the default package.