Structured files in folders and switched to nosetests