Refactored directory layout
Fixed LF