Refactoring. Moved uderscore lib to main layout