reorganized jade files and modified index again...