Package build was broken. Fixed. Also, I made the layout to follow package
standards.