refactored package names to reflect changes in mod structre (less modular more singular approach)