Paths changed. File structure overhaul.