Removed unnecessary directory nesting