Moved directory structure around to avoid nesting