correction for presentation purposes
refactoring moving all files into the same package namespace