Cleaned up jade file structure