Fixing code structure
Merge branch 'master' of github.com:Diastro/LBE-OperatingSystem