changed layout for consistency
added ./ everywhere