Packages and layouts
Merge branch 'master' of https://github.com/RenegadeEagle/LMS