Reorganized layout, corrected paths