More structure
Fix paths