Better indenting
Fixed merge
Added library module