Updated package structure
Updated package structure no 2