Using jade now, and better code organization