Cleaned up Code - Added Root Detection and Multiple Layout Folders
Cleaned up Code - Added Root Detection and Multiple Layout Folders
Merge remote-tracking branch 'origin/master'