Fixed includes paths for new folder setup